update main
Merge branch 'update-mainJS'