Updated GFM