Improvements and adaptations