Merge
Some Improvements