New version for Thibault