IS untested and share remove
JS changes