Merging RigidIBStartegy to CIBStrategy