changes for working with new protocol