Smart limit (24/41)

Smart limit