Added COC in new format, edited others