Update and finish project