handle undefined data better than last time - sorta