added a bit more to admind