Updated project using objects