More CHanges to JS5