Updated final project