Tweaks for hw4 part 2