homework and project2 changes