refactoring done - but goes several times into content