Updated final-project