Rework based on my wife's comments