updated links and NameSpace