Major change with adding WiFi support