Correctly implement success/failure tracking