Changed JS order