Limits management (4/31)

Limits management