Change of protocol to fit new needs