added tooltip. require polishing