code fixing

fix the code so that it will meet all the requirements