improved alignement with GT