Optimized Saving and added some details