Improved limit logic