Content type changes per Kirills request