First half of the big list fixed