CY: Completed assignment 2