Changed JS call locations