Updated Project for Demo