More changes to decoupling scripts no obvious bugs anymore. All seems to work MAR