Switch typing (20/23)

Switch typing