Edits by Hana