Switch typing (3/23)

Switch typing