commit sohail's changes