modif to fit new function declaration