Rebuilding "save" section