Limits management (8/31)

Limits management