Finalized JS

Finalized JS