Made the demo routing sane