Changed tooltop implementation