Updated with my solution for Assignment #2