rollback and corrections