Latest changes applied to the FWS (After update)

After the update of the FWS Sept 2nd.