edited assignment 2