refactoring
improve performance
remove unnecessary context save call