This is now done and I think everything is working.