manufacturer admin and fixes