changed registrations/m_extra to master/m_units