Remodeled the protocols

I remodeled the protocols as discussed.