Factorisation + changed variable name