some more modif