Using only one click handler (wip)