Updated js ordering