Sped up and fixed labeling null data issue