Fixed data picker. Better update and save.