Just a bit of working on update