With one additional minor modification for limits