improved endpointmanager
solved conflict