Fix the preivous commit, add tool tip