Changes and Improvements!