Edits from Sylvia and Piotry