some functions were renamed