Some Improvements

Added