Even More Improvements!