added conditional expression to conditionals section
added psuedo switch in conditionals section