Rewrite rest of switches