added somme changes