Added progress bar and fuel handling