Added "second click" functionality