better savepoint locations