This document provides elements to consider in designing the GHG Fuel Standard (GFS), especially in relation to the GHG Fuel Intensity (GFI) targets, the competitiveness of alternative fuels and non-fuel technologies, and what constitutes a sustainable zero and near-zero emission fuel. Concretely, this document suggests the incorporation of dedicated mechanisms to promote non-fuels on- board energy sources (e.g. wind and solar) as well as sustainable marine fuels based on electrolytic-hydrogen. It provides draft amendments to modify the proposals contained in the annex to document ISWG-GHG 15/3/1 (Austria et al.) as well as in annexes 1 and 2 to document ISWG-GHG 16/2/7 (Austria et al.) in order to operationalize the aforementioned mechanisms.