Rearanged some vars