Changed to report four buttons rather than two