Adapt to wld changes