Added factorisation to first part