removed client, added routing