New Saving Pattern, should be more organized and optimized