changed js, not slow anymore
merge conflict solved
sorted out merge conflict