working changes on dev_dave_merge before sockets integrations