Added more things to save new format coming soon