Changes for assignment 3