protocol update, bug fix