Get rid of the JQuery dependency
Merge lost functions