DTMF restructure to fix options issue