some minor edits from Marriot