Switch typing (21/23)

Switch typing