updated assignment 2.2