updated for rmr 3.0