Solved more in JS