working w/ new js
fix merged to master