Changed to work with the new data.