More functions converted...