Trying to fix the data structure