add more tips
sync with master