Switching to GF conventions