Realigned with official data source