changed update behaviour