more conversion changes