updated with JJWiFi