revamp pops and auto-stagger