Updated for new data