Transitioning from GTD to AF1