updated for HW6.1