Worked on routing issues