Refactored the clicking.