sending of wifi data should work
fixed merge problem