modified admin controller