updated to work with new data