Rig switching implemented. Changes in Rig creation and initialization.