Changed ButtonClicker to better reflect the current API