Updated with Project 1 & Project 2