first modify (fit GFW mostly)