(#19): instead of upgrade values, remove and add new one.