converged c.proto and s.proto