Removed redundancy, trying click handling again