This is the updated project - phase 2