filled in missing switch cases