revert fw opt telephony & added some extras