Edits requested by Boezi.