Incorporate HW7 changes