migrated to hrd to get rid of the warnings