Improvements and modifications