general changes to get n-proxy implementation working