Reverted saving to old method