Updated to use Weald V2 libraries