Improve routing and allow for corners