Reorganizing more variables