Added Adela's changes