use new content structure