changed type names and and or statements