Another change to data initalization