Some Improvements for everything