Improvements

Merged username-removed-65452 requested to merge improvements into master