intermediate save, fixed somebugs, in middle of implementations