customer offered bugs: fixed haoliang part