Moved to improved name and thinner data