added some admin checks