update according to dukeboard remark