mostly working with updated data