Finished simpler rollback algorithm