and save before commiting ...