Now includes factorisation.