Homework1 second edit