I think we can remove global checks and use the local ones