Title: Improvements and conversions