slight controller modif
slight controller modif2