Updates to logic for immediate and delayed tier changes.