aligned protocol logic with opensim-git