MOD: modify the whpone hander