changeto Jquery
modify for issue1