Improve a little bit the save action