Protocol update and small changes