Incorporated Laurel's excellent feedback.