save before the big switch over