save draft Refactoring

- bugfix