improving admin work in progress