fixed routing and mapping