Made some modif