updated script and  for 2.1