Changes for store purchaser so it's a lot less prone to issues.