Implemented Adela's changes