One more small change: check for cdd as well as lrs.