Changed parameters for two functions.