rewrite to introduce Fuel Components