save and delete testing, refinement