changed protocol strcuture
cleanup
cleanup