Improvements

- Changed the idea of applying before save.