Reference commit : NWS Version 2.0