Merge branch 'levelstructure'