Switch typing (18/23)

Switch typing