some functions changes