Few Improvements
pass