Changes for VipToolFX