refactor protocol

testing how git history behaves after merge :)