made it more robust: operational without proxy