shadow improvements
Merge