fix sucking bug before demo by commenting out
merge code