Improvements by Corentin Damman - autolin q6