Some chages to save and export