Modified for HRM1017