made Francoise's changes