big change to button actions