changed the way -N is handled