make cases safe save too