added handling for viz, eg, and cf see # 5