Homework1-rework