Update by naqvi