Revert "Revert "More Improvements""

This reverts commit ce9682914da7e186116dbb0ea0a14faaa0da4039.
Revert "Revert "Revert "More Improvements"""

This reverts commit 3ac406d2436cd0dd8853874dc1dc6fa34a79044c.
fix