Final Project commit 2