More Improvements in this branch