redo the changes that Ilinca made on the master branch