Finally got rid of NaNs - I hope!