Saving works properly now