Switch typing (16/23)

Switch typing