New work on RFmapping module