+ bugfix, + Admin function