Final Project Fixed