Incorporate some of Patrick's feedback.