Second commit.  This now has logic to prevent false failures