Fixed project 3 - final