Switch typing (22/23)

Switch typing