update according to stofs comments