Optimized by using store instead of add