changes to jquery
merge