More changes to RM
More changes to RM