changes to finalproject2