Working on routines to fix data