sh7
Updates to HW6 using Somesh's help