Added intelligent clicking