add hmac into the mix