Some Improvements on code before Merge
Some Improvements