some more functions converted