20141107: Update to HW4