Modifications after running toys for full envelope.
A few scripts have been changed to help handle this and
improve smooth running of batch toys process.