chaged some function names