same as previous commit but with admin counting