Re: a few changes for HDAMA