Factorisation + bugfix autogrow