merge Dung's changes