updated for new data