More changes to JS5