Final changes to code before submission sunday