More level improvements
Merge