tweaked Source environment management