Fixing up RM some more