incorporated ttencate's suggestions