Changes for WIFI in 2.1