merge with master
update fuel