AVALANCHE: Move some variables around