Adapted for new data