SHOP | Improved Performance