storemode now handled correctly