added HW3 support