Updated NL logic