rebased to master
added AES channel with mac