#36 switched to ButtonListener from default Listener