changes by Arfan