fix other functions to accept new argument form