changed order of js