Modifications and Improvements