More work on adminAdmin