Updated with 371 data (7.1 and 8.4 respectively)