ENHANCE: Complete Assignement 3