minor changes. Homework done