Protocol Switch #3 suggestion #2