Added extra work on admin screen