more changes for new tooltip