Additional Improvements