Improved code, added fuels