Steve's version with na.omit()