Limits management (24/31)

Limits management