Updated to newprotocols