changed order for routing