Fix VIP ending with MVC
Mod disc switch point
Discr sw points
new cat of disc sw
Merge