Added support for custom tooltips
Revert debug