Finish protocol changes