last few commits meant for project 2