improve some tips from rips,