Better routing for wrapping on the X axis