Improvements and changes