change save behaviour