Update the way we handle click events