beginning changes to allow single click