Merge branch 'leveling'