some modifs done