Better separation between pyV2S qnd pyV2TB