update by mentor's suggestion