Changes for assignment one