Savepoint before moving to Esquire 1.x