added comprehension to replace NaNs with ?