more changes for conversions