Limits management (7/31)

Limits management