Improve GFM