Changed names of functions