add RF anfd updated items to be more modular