next com 1
next com 2
next com 3
fix 1
merge fix