Updated JS
Reorganised