get rid of another switch case