Rejigging things a littler more