improve conversions

improve conversions