20141107: More updates to HW4