update to handle fixed routing