Converted more functions