Fully converted to button Enums