added beatsender
more logic