Fixed half of Administration
fixed merge confilict