Now using advanced routes instead of old naive routes