added better admin controls