More accurate now than it was pre-2016