Make limits feature more concise