More logical routing