Use unified Nm/Ne presentation, indexed by bool
Added intermediate directionless stage