Modified the JS problem