Protocol tweaks Pull Request