Limits management (9/31)

Limits management