New protocol
Adapted to new protocol