redo some contentmanager stuff