changes in protocol (need fix)