Last Changes and Refactoring