More work on routing