Trying to push GF&S right