Updating with final CSE332S Project code