Project 2 take 2

Modified