Adjust according to Keith's comments.