bugs to make old and new rig compatible