Submission 03: corrected treatments of NAs