My assignment 2 solution