refactored to be compatible with latest WTA network code