update for parseNowiki, will test later...