redid some routing