Add HCRA back and fix some bugs