Move some variables around