change names of func