Last rewrite of switches -> hubs