Added buttons to facilitate testing