Made changes for assignment. Tested.