fixed routing and models