Improvements on Rollback