Save only what we need