Adding Saeed's changes