Incorporate Bill's overflow checks