Refreshing NGPVAN fork