change js to jq style
almost finish