Updated to latest protocol

Everything has been hand tested from the server-side.