changes added by trang