more changes by Arfan