Alignement on last David's version