added js options
merge conflicts