[OE-2714] updated to use the new handleButton method