hw5 changes
merging