Move hmac new order
Comment updates