add-source handling when one sandbox + better name for variable