Added lastest changes to HW5.