Changed some old function calls