finish T20 refactor admin