add huawei changes - thanks dazzozo