Updated code to get data better.