Adding Maral's changes