Made some changes

Luisa's changes