savepoint prior to refactoring