No longer dependent on wd