Save method logic changed.