Uniform requirements

Uniform requirements