update for RM version 2+