changes to obey the code specs