update according to dukeboard remarks