JS Improvement