Changed local variable placements again