Fixed bug in protocoll.
Rmoeved fn for now.
Merge branch 'test' into dev