Major changes to the code base due to the new store milestone