Added code for project at current state