Major modifications to wt.