put back role check