Modified the conversions some more