Final protocol changes