updated according to new class names
renamed protocol