Assignment 2
Minor changes