Update protocol and fix loiter