Add leaf width, add THOMAS in gammar