big change after discussions with Alexandre and Andrei