re-introduce changes in protocolmanager