SOme changes