Added the rollback stuff