Rewrote FuelHandler (no hardcoding :D)