modifying some functions !!
!!