Corrected Save and Display