ngp branch commit 2