updates as per the comments in NWS-381