changed flow of aloha_mac