Homework 1 fixed