some changes made by amir and shanshan