Second addition to 0.2 and fixed a tooltip