bug changes for HW6