trying to fix content handling, currently broken
fixed content composition, not sure I like it though