change implementation of save load handler