Revised, added signalstrength