Modified mac and radio, added message