Latest Data check and Re-do - done april

Latest Data check and Re-do - done april which was the worst because of
changes