Incorporate edits from Mike H.