new branch with new module json
fixed and change js