replaced old style function calls