Implement changes from Chris's feedback.