Insert and save refactoring

ooops