rollback and tweak