No conversions needed any more and some more functions.