Switch typing (15/23)

Switch typing