still working on fixes for MRS 6