change function calls in order to be more consistent