Switch typing (17/23)

Switch typing