follow api changes in HRR