Modified the conversions and such