Finish HW04 normal upgrading