improved discard limiting