Final changes to final project