adding changes from last week's rollback