New Pricing Grid + HOTFIXES