Better behavior with first WIFI signal data