added latests changes after copy