Changed to use both the connected event and setup complete event to coordiate proxying closes #575