CHANGE: Update to button flags