Routing changes for control (forgot to add last time)