Correction parts NB and changed i:s in naive