Project 3

Fix and change from project 2