Update method improved