functional refactoring of the click selector.... seems completely stupid