added hui's changes