Updated for RM 2.0