More Modifications and Improvements