Adding call-with-environment-variables for the transition