Make rig better