update for RFRemix 22