add more types
more topics/types
case corrections