added ana's changes