v1.1 commit before addition of sockets