Added edits from renix.