Keeping Better Track From Factory to Checkout