Re-add RMSs as they work again