some modifications !!
!!