minor adjustments rollback