shift setup improvements