added D7 and D8 data.