Updated to latest protocol