Progress towards WLD handling