Changes for assignment 1