new rig set-up optimization tweaks