Getting closer to matching GHAT and GHAT2