oo-admin-chk refactor