Updated ng client