Updated data and reorganized