Updates bug - taking care of older data structure in updates