Finalizing changes before handin