Limits management (3/31)

Limits management