removed old delegate pattern
Merge remote-tracking branch 'origin/master'
restored correct save / load behaviour after merge mishap