refactor of call edit/model
fix