Changed back to click listener