Double Click implementation
Merged for doubleclick
code clean up