adjusted to new content type structure