first step in fixing save steps