Add GF stuff