changed names of functions