Code simplified - MooC
First sort of tooltip added