new version, with content