update for RFRemix 20