Changed to JQuery calls