Added zoubin's changes