Going back to orignal code from Assignment 2. Part 1 seems ok