Discount Dan's Changes and Fixes!