Improved saving

+Not much more to say....