Moved to JS file