20141016: Updated work on assignment4