edit and fix