Final assignment 2 modifications