updated protocol, added conf