cleaned up adminAssign and fixed some logic