 +		fuel_norm = 1.0;
 +	}
 +
-+	setprop('/consumables/fuel/tank/level-norm', fuel_norm);
-+	setprop('/consumables/fuel/tank[1]/level-norm', fuel_norm);
-+	setprop('/consumables/fuel/tank[2]/level-norm', fuel_norm);
++	var density = getprop('/consumables/fuel/tank/density-ppg');
++	var capacity_wing = (getprop('/consumables/fuel/tank/capacity-gal_us') + getprop('/consumables/fuel/tank[1]/capacity-gal_us')) * density;
++	var capacity_center = getprop('/consumables/fuel/tank[2]/capacity-gal_us') * density;
++	var refuel_lbs = (capacity_wing + capacity_center) * fuel_norm;
++	if (refuel_lbs < capacity_wing) {
++		setprop('/consumables/fuel/tank[2]/level-norm', 0);
++		setprop('/consumables/fuel/tank/level-lbs', refuel_lbs / 2);
++		setprop('/consumables/fuel/tank[1]/level-lbs', refuel_lbs / 2);
++	} else {
++		setprop('/consumables/fuel/tank/level-norm', 1);
++		setprop('/consumables/fuel/tank[1]/level-norm', 1);
++		setprop('/consumables/fuel/tank[2]/level-lbs', refuel_lbs - capacity_wing);
++	}
 +
 +    removelistener(l_auto_refuel);
 +	print('Aircraft refueled.');

diff -ruN 757-200-master/757-200-main.xml 757-200/757-200-main.xml
--- 757-200-master/757-200-main.xml	2015-07-09 05:37:48.000000000 +0800
+++ 757-200/757-200-main.xml	2015-11-05 21:37:00.532145471 +0800
@@ -691,6 +691,7 @@
 			<file>Aircraft/757-200/Nasal/pneumatic.nas</file>
 			<file>Aircraft/757-200/Nasal/hydraulic.nas</file>

 </PropertyList>
diff -ruN 757-200-master/Nasal/auto_refuel.nas 757-200/Nasal/auto_refuel.nas
--- 757-200-master/Nasal/auto_refuel.nas	1970-01-01 08:00:00.000000000 +0800
+++ 757-200/Nasal/auto_refuel.nas	2015-11-06 20:59:53.193951426 +0800
@@ -0,0 +1,30 @@
+var l_auto_refuel = setlistener('/sim/signals/fdm-initialized', func {
+    if (!getprop('/autopilot/route-manager/active')) {
+        return;
