DRAFT AMENDED CODES!