hw_17 changes