fix and edit