LDX and small changes