fixed saving and creating