[OE-2714] updated to use the handleButton method