Major Modifications to JS