Repairs after merge
debug disable
problems with setting first content?