diff --git a/pkg/bbgo/indicator_set.go b/pkg/bbgo/indicator_set.go
index 0d5dbd363..68bc74f48 100644
--- a/pkg/bbgo/indicator_set.go
+++ b/pkg/bbgo/indicator_set.go
@@ -73,6 +73,10 @@ func (i *IndicatorSet) VOLUME(interval types.Interval) *indicatorv2.PriceStream
 	return indicatorv2.Volumes(i.KLines(interval))
 }
 
+func (i *IndicatorSet) VWAP(iw types.IntervalWindow) *indicatorv2.VWAPStream {
+	return indicatorv2.VWAP(i.CLOSE(iw.Interval), i.VOLUME(iw.Interval), iw.Window)
+}
+
 func (i *IndicatorSet) RSI(iw types.IntervalWindow) *indicatorv2.RSIStream {
 	return indicatorv2.RSI2(i.CLOSE(iw.Interval), iw.Window)
 }
diff --git a/pkg/indicator/v2/vwap.go b/pkg/indicator/v2/vwap.go
new file mode 100644
index 000000000..fbb659ec3
--- /dev/null
+++ b/pkg/indicator/v2/vwap.go
@@ -0,0 +1,43 @@
+package indicatorv2
+
+import (
+	"github.com/c9s/bbgo/pkg/types"
+)
+
+const MaxNumOfVWAP = 500_000
+
+type VWAPStream struct {
+	*types.Float64Series
+	window          int
+	rawCloseValues  *types.Queue
+	rawVolumeValues *types.Queue
+}
+
+func VWAP(price types.Float64Source, volume types.Float64Source, window int) *VWAPStream {
+	s := &VWAPStream{
+		Float64Series:   types.NewFloat64Series(),
+		window:          window,
+		rawCloseValues:  types.NewQueue(window),
+		rawVolumeValues: types.NewQueue(window),
+	}
+	price.OnUpdate(func(p float64) {
+		s.rawCloseValues.Update(p)
+		s.calculate()
+	})
+	volume.OnUpdate(func(v float64) {
+		s.rawVolumeValues.Update(v)
+		s.calculate()
+	})
+	return s
+}
+
+func (s *VWAPStream) calculate() float64 {
+	vwap := s.rawCloseValues.Dot(s.rawVolumeValues) / s.rawVolumeValues.Sum(s.window)
+	s.Slice.Push(vwap)
+	s.EmitUpdate(vwap)
+	return vwap
+}
+
+func (s *VWAPStream) Truncate() {
+	s.Slice = s.Slice.Truncate(MaxNumOfVWAP)
+}