Added empty function factorisation