more changes GF