Update to final project