Final updated for final project