finally supporting fw 2.0.0