Working on the 2P rig