adjust function params to make clearer