Improved FB.  New SQL Script.  Better logic in place