Tried to make it more efficient.
Trying to get the store to act better.