PSW-87 : improved update method