remove temp warning.
Handle missing data better.