merging with fg version