Expanding tooltip functionality 6