More Engine conversion ...

Updated engine conversion