Move to new version of Trinity