Updates to RMOS