First changes for project 2