Moved order of js