Remove BUS, Add CRN, EPT, FF, HVR