Changed from array structure to list structure.