Fixed Final Project