More edits from Arya