Minor changes in Save method