added Override, X-ND updated