Use teh proper function calls