incorporated Ozlem's changes