completely rewrite single click capability - issue #288