changed 'NA' to None