Switch typing (4/23)

Switch typing