Assignment 1 Re-do..