Edit and fix