Some more GF stuffMS#28