some modifications  for the second time