More data, updated plotting