Assignment 2 related changes