Edited assignment 2