Added in better handling of lack of data.