Update #10 - added rollback