update according to advice from dv