Major changes to Pricing Table and speed up controllers with ||=